fix bunches
remove unused files