More bootstrap and cleanup