general cleanup
model class moved