TCK exclude - cleanup