GPII-925: Code cleanup