fix build and cleanup