Removing unneeeded stuff