Deleted bunch of commented code