Fix fatal error due to name change.
Remove unused files.