cleanup unused classes, code and misc seetings