Attempting to fix fastmode problem code cleanup