Cleanup merge #1

This is just the beginning...