Removed parrot specific states and tidied up state usage