[PATCH][for 21.0] Basic package deletion & maintenance