Remove worker functionality
Ordering, display time bug