Remove defer to cleaning data (faster execution)