Do some more controls cleanup