remove old Stuff and fix some Tests