Cleaning import, most of them, removing deprecated dependencies CAF-162