mega clean up of analysis packages