Removed class in lieu of namespacing.