Removed unecessary options currently