Remove speed test, at this stage it's not useful
Remove deleted code