removed membership and refactored server to use modules