Clean up
Fix merge