Remove unimplemented -safe switch