minor update to remove some used code