Removing junk client and secret codes