Got rid of stupid dependancies