cleaned up, preparing for the 2-1-stable branch