Remove the LOCKS_SWITCH_TIME conditions