Remove test implementation