Cleanup lint warnings about simplified attribute