strip out unnecessary entity stuff from server module