code clean-up (removing classes, which are no longer used or represent drafts of any kind, removing unused imports,... etc)