Removed unused and commented code #2