Some code clean up; removed unused delete calls from tests.