remove EC2 specific code
add logging messages for id guessing