Code cleanup - whonix* not tested