FMU-17 Import statement cleanup