#1597-Prepare to remove old/unnecessary components