Refactory some code (2)

I'm currently too busy with assignments so I make this commit later than
planned, sorry for that.
- Refactory "Remove" function
- Remove (maybe) all magic numbers
- Problem with tree tree.updateWithAnimation()  so I temporary remove
animation for "remove" function, will fix it as soon as posible