Remove redundant module/class scoping