Clean up some class files that are no longer needed
Add Queue