undo small artifacts of entityexplorer specific code