removed old builder and utility classes