Removing AMD-dist dependency