cleaning up for packaging