remove some stuff?