Removed static singleton