Removed lint flags/comments, will rebuild them later
Cleanup