Remove deprecated scroll States; Fixes #1