[fm4] Remove unused imports and minor changes