Cleanup. Added publishing.