code cleanup, merge remote from openvix/enigma2