more fixes
more refactoring
remove automated testing