do cleanup builder server code
remove debug code, only one pass is used now, use more suitable names etc.