More controls cleanup.