Remove template and less code