Cleaning up npindex