code cleanup; removed compile-time errors