Cleanup of the SDK & Archiving support added