Code Cleanup

Remove duplicate boolean