Code cleanup: Removing the unused files