Remove a bunch of unnecessary code in components

Because it's distracting me