Recomment out some code, specifically same type test