Removed a few unnecessary bools