Remove reportbuilder dependency