Small changes

Reverted the speed and removed unused code