other cleanup comments