Removed Uneccessary Code