Remove list and dict calls