Cleanup and added upload switch for catalog item