removed some quick and dirty code for data package