New helper code (2)
Removed old code. Moved some helpers to core API