more cleanup, switch to proper stateussage @ skillcontroller