MAINT: remove some unused options and standardize some notation