remove action mapper, refactoring