What's up with this? Just dead code clean up?