minor formatting cleanup

remove old commented out shit etc