More controller cleaning.