More Clean Up
Revert "More Clean Up"

This reverts commit 986747f09f34a8b49e694f2e0694674c73b57318.
More Clean Up V2

Damnitall.