Moved DEBUG_PATCH_SETTINGS into correct logical location. Removed commented-out hack lines.