removed usage of global variable - not ideal yet.
Gom::retrieve would not have worked (currently not covered by tests). Removed other (redundant) usages of self.