Removed several unnecessary options as per discussions with Murray