Back Issue - Remove unnecessary stuff

Back Issue - Remove unnecessary stuff