index: Remove optional type attributes, clean up