Remove helpers and moved to theme