Remove useless stuff
Update
Curren testing