Cleanup of part 2