cleaning up tumblr legacy code