commit before asking for help on mremote forums
removed cleaning pieces for now

no need for these while working on conversion