next batch of lint clean up