hlim10 kchen26 : Removed unused codes