cleanup files termination categories
first commit removes several duplicate files (discussed with Thomas) other three commits are minor bugfixes
first commit removes several duplicate files (discussed with Thomas) other three commits are minor bugfixes