Removing beautiful soap dependency