Just a little bit cleanup: removed unused variables, introduced variable "MB_server" to reduce code, removed useless code from one of my last contributions