Remove unused/unnecessary imports. Add missing javadoc @param.