Removed more inlines