[FIX] Removing extension dependency