Removed cucumber cruft