clean up code. Delete extra action even listeners