Remove unused function declarations
Work-in-progress