Upgrading components & removing unused stuff