Clean up from using useless bools