clean up associations/dependencies [Finishes #69723432]