Commented out unused files and added TODO comments