More Cleanup

Cleanup Related to Previous Comit