Removing legacy dependencies