Removed Speed class and Speed Decorator class