Misc cleanup / moved some code from VFConnector to SDK / more to come