Clean up of com package.