cleaning up old adacgh2 pacakge code