Removed a redundant step which degraded performance