removed pooled entity stuff for now, too complicated to do this in a rush