Clean up of master and slave interactions