cleanup and build automation improvement