more compile cleanup