remove upload hack, clean up unused stuff in the build