old code cleanup
fig:case