No functional changes. Deleted unused files.