Cleanup redundant qualifiers and code in realm
Cleanup redundant qualifiers and code in world