Removed unneeded bools