Reduced the scope of dev