Removing CCV and cleaning up JS