Removed obsolete or useless code

Some commented code makes no sense because there is not comment as to why it's commented out. Removed.