Cleanup after merge, nearly done with save functionality