Cleaned up codebase and removed protocol.