Remove test and dead code