Cleaner init/cleanup sequence on engine/app