2.2 Archetype

Authentication error message added and cleanup done.