Don't remove M2 composer.lock file as it is versioned by Magento now.
Removed composer commands for setup dir (doesn't exist anymore).