Clean up a bit, keep whole index in projection