Clean up redundant if statement