Add remove world function
Merge remote-tracking branch 'origin/Mike' into kchen
Merged with kchen.