#162. Remove templated/widget from these classes. They aren't widgets