Cleanup Unused Code
Additional Cleanup