Removed scenario classes, cleaned code.