remove _self vars