(HEVC) Clean up