Hard reset to old version and cleaned up that version to hopefully have everything working correctly now