Remvoe dead code
Remove test