Switch to _raw and cleanup some stuff
very primitive aliases support