Got rid of some useless stuff for world