removed unintended singleton