Remove some commented-out crapola
Make new backend DRYer