some cleanup, removing commented out sections