move useless raws into overrides