Remove remaining undefined code