big clean up with associations sanitization