remove remaining original code