code clean up: removed unused code