Semantics and cleaning up Crypto references