Removing stuff.
Merge remote-tracking branch 'origin/mini' into mini