WIP: Remove unneeded Cucumber features