Removed test functions