Remove leftovers of pulling #505