Removed experimental code.
Adding memory safety.