Wikia/mercury — pull request #488 by hakubo (2014-12-31 12:00:36+00:00)
Title: Small tweaks

mostly remove dead code