drop some unneeded code