Remove template
Initial build code
Remove unused class