Removing some paranoid checks inserted while evolving this piece