build fix; cleanup