Cleanup from old templates implementation