more bootstrap and client cleanup