removed a shit singleton