Luoy6 Deleted some unused code