Removing trashes & minor changes