Cleaning up patch for maintenance to be less 'busy'