clean-up & maybe ci fix