Removed leftovers.
More cleanups.
Adjusted time spent calculation.