Remove string formatting stuff which is no longer needed