more clean in legacy packages