clean up + fix models