package clean up, test merge