Remove deprecated short circuit code