Updated for removing unused items and warnings