Re-name and remove some dependencies