refactor CI and remove some cluttering