Cleanup
Removed redundant boolean