Removed class (will repackage later).