[PATCH v2 00/14] Unreacheble code cleanup