Removed Unwanted Code And Cleaned Up

Removed Unwanted Code And Cleaned Up