Reorganize

Removed unnecessary items