Removed some unused items