General cleanup on forwards.