tidying, removing unneded stuff