Remove unused functions for clarity