got rid of some commented stuff