Removed some state from announcement form
Merge branch 'master' into hoyt