lots of cleaning up
remove deprecated files