Increase efficiency of interchange, remove excess code.