Comment out for now and fix exception in instance list.