Got a mu to work properly in Jython and started macro cleanup