Removed unecessary boolean