Finish cleaning up for peps and lint checks