Clean up some lint stuff