Cleaned up the files. Further cleaning is still needed.