Implement 105-1
Remove unused code