Removed unused dependencies
Added fserver reference