Remove some commented out logic