Additional lint definition cleanup