Use complies throughout and remove unused code.