Remove unused but otherwise convenient functions