removed unused code and data