Remove unused code, fix decision