Removal of commented out code from copy/paste.