Removed outdated StateSelector