got rid of unnecessary dependancies