Cleanup. Remove many files to make it easier to maintain those left