Removed almost all statements to not index properties in entities