Remove old template system