Cleaning up stable branch