Removed some commented out pre-0.5.2 code