removing and organising some things