More cleanup / getting rid of unused files