further cleanup in forcerec.c