ClosureLint cleanup