- Removed unused code (cleaning)