clean up of BioPAX branch merge