use commonplace and cleanup