Sponsor upload tweeks
Ran some code cleanup functions, removed unused references