cleaning up commented out code