Merge "Remove _create_port and create_keypair methods"