Cleaning up template block service