Clean stuff up internally for 1.1 release