rid of uneeded code