Remove unit stuff