Removed unused commented code