remove outdated comment
clean up magic a bunch more