WAL segement issues on both master and slave server

Hi there,

I am running into an issue with the number of files that reside on the
pg_xlog directory of my compliance database server (This one is the master
server in our master-slave setup). Sometime earlier this year, I modified
the location of the PITR directory and that caused an issue with WAL
segments not being sent to the correct location and crashing the DB. I went
ahead and fixed that up so that it points to the correct location but since
then the number of files on the pg_xlog directory went up from around 898
to 1025. I didn't have a chance to look in to this issue until now so my
question is do you know if there is an easy way to clean up some of these
files in the pg_xlog directory safely? I believe that there might be some
orphaned files there and would like to clean those up.

Also, on the Standby, the pg_xlog directory appears like it is growing on a
daily basis. The WAL files are being cleaned up but I don't believe at a
fast enough rate. This directory is approximately over 650GB in size and I
would like to revisit if any of the parameters will need to be changed in
the postgresql.conf file since it's almost 5 years since I last touched
this.

Let me know if you need more details to clarify.

Thanks.