Clean up
Merge master