Removal of unused function