GPII-259: Code cleanup