Removed FW dependency

Removed FW dependency