server complexity reduction
dead code
test fixes, removed dead code
Merge pull request #48 from SalvationDevelopment/Server-Complexity-Reduction

Server complexity reduction