Removed ugly commented out code