updates to remove unneeded code