Cleaned up imports, removed dead code