Remove stupid clips count that never worked.
Resolved merge conflicts with upstream.
New path handling.