enough commenting out with minimum actual fixing to get occ building with new api
removing tmp files from commit