we verified these already
Merge branch 'cleanup'