cleanup
WEB-9926 support "package" scheme