Remove inline into cpp