Delete trash
Some improvements