Cleanup code a bit.

Drop compatibility code that is no longer supported

Use 'brand new' primitives.