cleaning up core of cucumber setup