Refactoring: remove inline functions which were used only once