Clean up of code and packages