clenaing up and upgrading components