added control view cleanup