gbs packaging
Cleanup packaging