Delivery Details

Using Shop 6.6.4 and I sell services. Nothing to ship or download. I need to totally eliminate ‘Checkout Step2’ and move Step3 into Step2’s place. Or at least remove all those required fields. People are already a little edgy when it comes to sharing their information, and I don’t want to be seen as suspicious or as an idiot for collecting a lot of data I don’t need for what I’m selling. I also need to remove all those same fields from ‘Account Details’ as well. I’ve looked in: defaults_cart.php, tpl-checkout.php, tpl-account.php and class_white_label_themes.php and can’t seem to find the related code for either the ‘Delivery Details’ or for those fields in ‘Account Details’. Anyone tell me the correct files or code I’m looking for?