Post-commit cleanup part 1

1. Test code
2. Clean up code
3. Commit code
4. Test code