Removing unused code and packages