Remove this necessary stuff?