Clean up views, specs passing.