Remove helpers from model
Some minor changes