Remove umpty helpers
Add indexes