flag with remove in 5

so we get a compile time error when we bump to 5
clean up some redundancies