Revert "cleanup, prepare to merge"

This reverts commit 402ac6c4990c2b8adebc8836eb0bdb312bce71e0.
Merge branch 'louis'
Revert "Merge branch 'louis'"

This reverts commit fe970dc20b33e435cf82519adbd88114a57bb942, reversing
changes made to 54a10003db0e647c69210589766d48eb646834ec.