Removed obsolete commended out options