Cleaning up package structure