some residual code cleaned up