Added type for State World [String], removed obsolete methods.
Removed obsolete methods.
Merge stuff.