that file has not been modified for 4 years. I dont think it is likely that there will be bugs fixes. So since it is in our code base lets do some cleanups to minimise + clean up the code