Removed dependancies to make them 1.9.3 compatible