Inclusions cleanup