Removed Unneccessary Code