Clean up the code base. Find out what are what