Changed visibility of removeBehaviour to public
Implemented new hybrid state machine

Did it using the enum and the FSMBehaviour.