Remove inline and wrapper function