Remove counting thread, use millisecond logic instead