Revert "Preparations for non-player entities!"

This reverts commit 43f0dc051b063734207e5c31490b8dd15cbca03a.