removing commented out parts