Cleaned up the service consumer/producer and field indexing - removed unnecessary classes