Removal of unecessary behaviours

Removal of unecessary behaviours