Remove un-needed compontents