cleaned away vestigial code