First version
Remove unused code