Remove from commerical components