Remove helpers

Finished removing helpers and now using "system"