Updates for new app deploy and misc cleanup