Removing vestigial code'