Remove unused code, fix initializer