Remove all definition
Change condition on constructor
Completed method for actions