Cleanup and removal of commented code