remove limiting boilerplate helper classes