Refactor Trash stuff