Deleting unused bits, cleaning up syntax around some ported code internals.