fix file endings, remove some obsolete usage, remove unused classes from util