removed OSX fix attempt
removed obsolete setState calls