Changed pre remove on Guest schema