remove more unneeded code