more build fix... and cleanup