CRUISE: Remove some useless variables, use a boolean for a variable