Cleaned up quite a lot of files