Removed unused imports
Cleaned up wire protocol