Fix/remove index