Removing unecassary Eager Singletons class