got rid of a load of commented out code/var dumps