remove bogus npe check
remove flexible strategy (not used)