Cleanup in package common