Cleanup: Removing unnecessary logic checks