Hacked in transparency, removed some deprecated code