Initial commit
Remove unused code