Remove unnecessary components