Initial merge
Cleanup