removing commented out code and cleanup