removed all old and unused crap about actions, phase 1 out of 3