removed unused code - 2