removed old api code and combined old server with new server

This completes the PR a bit more. Take a look and see if you agree with the changes.