Removing object reader which simplifies the code quite a bit