removed some more stuff that wasn't really needed