Cleanup for distribution #1