removed deprecated hack
Cleanup