Cleaned up minimal index