Code cleanup: Removing unneeded name files