Cleanup in progress, related to #2 and #6