removed a bunch more things