Cleanup. Modernized appinfo module