removed create_trash call
Big update and successful merge