GPII-434: Linting fixes, dead code elimination