Reduce dependancies