Remove old command detection system
and use the new LINQ one