Clean up behat scenarios and remove unused method