Start cleaning up some stuff

there might be a lot of these commits ...