Removed unwanted boolean variables