Remove unneeded stuff
Reorganize