Add boiler plate code
Remove unused code