removed remnants of non-Mustache approach