Remove unused function and completion