some cleanup
Merge branch 'v7-stable-cleanup' into v7-stable