Cleanup model imports and use of column_by_name & prestation_by_name. Cleanup some headers.