cleans up commenting, removes commented out functions