Disable non-working items for now, to get the other changes deployed