packaging cleanup