Revert "serverengine"

This reverts commit 40e670f77b8e3422f2c9dfda6cbaf4788bb24cd8.