Removed direct function call