Moved answer expansion and number stripping (JP questions) to file loader