Removing the generation of Fluent mapping