cleanup of unneeded code