Cleaning up code - old stuff can be found in old commits