Add indexes, delete unused files