Cleaned up Server and ServerInterface