removed test code and cleanup some stuff again