Moved the delete class to entityEntry