remove several unneeded things