Cleaning validators, filters and other