cleanup
feature-cleanup merged into master; closed