fix action duplicates
code cleanup