Cleaning up
merge