Remove temporary vars