Remove leftover $self vars