Cleaning up shadow datatypes