Implement 105-1
Remove unused code
Fix 105-1