remove excess code