Remove unused code and adjust speeds.