More conversion cleanup (near the end I swear)
Moonscript code removed