clear up historic stuff, more refactoring must follow