Cleanup package mess.