remove some more unnecessary inlines