Clean-up from the dead code