get rid of more components

Authored by camiloh on Jul 20 2019, 2:17 AM.