Removed old code, almost complete change to serpent.