Cleanup client app bootstrapping