Massive clean up. Will continue soon