removed unused code completely