WBL: Clean-up generated template classes for GAE