Fix/removed bootstrap

There were some bootstrap dependencies left, so I took it upon myself to get rid of 'em.