Cleanup
Merge fix