Added loading tracker.
Removed some unused code.