Removed test,dead code