remove test code which had been copied from core earlier