Removing principal instances and REALM is very discutable. I choose to do this as the poor-man solution but I'm actually open to any other proposition :-)