Cleaned up some stuff around the refreshqueue.
Cleaned up unused imports.