config, bootstrap and dependencies cleanups