Remove moved or unecessary options