Drop not used imports
Separate file format logic from models