complete code cleanup, merged remote from openvix and openatv