Remove useless code
Organize