Cleanup old prediction fix development code