Update ACP module and remove deprecated functions