Revert "adding things willy-nilly cos it compiles on my laptop - wololo"

This reverts commit 12fcce1d3657faa67ed4c2a577eb1bd21c4cde69.