Removing the singleton since in reality it is not needed.

Signed-off-by: Alfonso Martinez <corrupted.rogues@gmail.com>