rspec cleanup (remaining features disabled until UI finalilzed)