String formatting.

Housekeeping of string formatting, removing a redundant file.
Remove redundant code.