build: cleanup and update