Remove temp variables