Cleanup model code