Removed leftover unused commented code