build cleanup for nicer packaging