#158 Removing dead code