Clean Up

Removed redundant checks.