cut unneeded code