removed unnecessary bools