Cleanup

This is a long term branch.