Updated to latest versions, removed SCCT