Remove now-modularized components