remove remaining functions