remove these two completely. They are only need in the *Raw class.