core changes and removal of unused items