Associated Objects post cleanup

Change-Id: Ibecad2dd5933caeb6688e1f76ec64d9b85c208fa