Revert "Revert "General Cleanup""

This reverts commit 45ad37596e97bcb8a1260f973ba6ca22322fc81e.