removing extra actions, some feeder modifications