Specs: Cleaned up after adding mode