removed unused code
reverted wrong changes
reverted wrong changes