Changed some stuff, removed some stuff

Removed some unnecessary functionality / removed some stuff that won’t
be finish-able in time for the deadline.