Clean up a bit... removed pointless/old comments