deleted trash
some cleanups