code cleanup; removed not used functional tests