General Code Cleanup

-119 lines