Removed some unused commented code