Removing unused functions