Merge changes from upstream
Remove trash