Remove unused and specific function