Remove temp vars