cleanup, timings
merged changes from gtrak, removing timing macros