Remove test functions