continued extensive clutter removal. redefining associations. migrations tidied