Revert "Added generic singleton pattern."

This reverts commit 25d304a335fa48475401da1bda338fded0073419.