Remove disused deprecated methods, deprecate no longer needed converter, tidy up internal API details