Non-substantive cleanup