Remove old imports. Update git ignore.