Clean up client & handlebar helpers