removed unneeded bools