+ timing test code
+ removed old code