Deleted More Useless Code