tidy up commented out code