Remove the test functions