Removed protocol
Tons 'o DB refactoring