Merge master and cleanup