Removing fm calls

Change-Id: Ifc0c6f9933e199c43008cc3d217984e9dd65ff4f