Added alias adding/removing to _cleanup/_setup