cleanup and attempt to fix build