Bugfix with CVs, removed unused uploads