Got rid of stupid singleton