Removal of unused functions