remove even more unneeded code