comment out more stuff i don't care about