removed elisa entity n stuff