Clean up of lint and such