Removed actions introducing signals
Refactoring