Removed unused class.
Updated uses of timestamps in SECONDS to be MILLIS.