Removal of uneeded function