Cleanup

Merge to master