Removing vestigial code