clean up and add fm support

Change-Id: I44c88620580ab3c4b4ef1796eece0cd3f1fc2d66