Sort expected props, remove debug logging