Removed debug message
Create new Speed class, and update related calls