Remove Unnecessary If Statements