Cap cleanup