cleanup unneeded code